Remove unsplit element classes and pseudo-classes

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=687465
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>

diff --git a/src/st/st-theme-node-private.h b/src/st/st-theme-node-private.h
index 5958441f9f942fc22ddedc23d8adaad6a0a993db..1f87591424609dd1bd2a115e7c66cd2944db6f88 100644 (file)
--- a/src/st/st-theme-node-private.h
+++ b/src/st/st-theme-node-private.h
@@ -77,9 +77,7 @@ struct _StThemeNode {
 
   GType element_type;
   char *element_id;
-  char *element_class;
   GStrv element_classes;
-  char *pseudo_class;
   GStrv pseudo_classes;
   char *inline_style;
 

diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index 1eda14d0acc7eb92c280d52e31a38d156648723c..fb7e9fb22c1eff270a88ec053924071c491c2bfd 100644 (file)
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -96,9 +96,7 @@ st_theme_node_finalize (GObject *object)
   StThemeNode *node = ST_THEME_NODE (object);
 
   g_free (node->element_id);
-  g_free (node->element_class);
   g_strfreev (node->element_classes);
-  g_free (node->pseudo_class);
   g_strfreev (node->pseudo_classes);
   g_free (node->inline_style);
 
@@ -230,9 +228,7 @@ st_theme_node_new (StThemeContext    *context,
 
   node->element_type = element_type;
   node->element_id = g_strdup (element_id);
-  node->element_class = g_strdup (element_class);
   node->element_classes = split_on_whitespace (element_class);
-  node->pseudo_class = g_strdup (pseudo_class);
   node->pseudo_classes = split_on_whitespace (pseudo_class);
   node->inline_style = g_strdup (inline_style);
 
@@ -288,14 +284,6 @@ st_theme_node_get_element_id (StThemeNode *node)
   return node->element_id;
 }
 
-const char *
-st_theme_node_get_element_class (StThemeNode *node)
-{
-  g_return_val_if_fail (ST_IS_THEME_NODE (node), NULL);
-
-  return node->element_class;
-}
-
 /**
  * st_theme_node_get_element_classes:
  *
@@ -309,14 +297,6 @@ st_theme_node_get_element_classes (StThemeNode *node)
   return node->element_classes;
 }
 
-const char *
-st_theme_node_get_pseudo_class (StThemeNode *node)
-{
-  g_return_val_if_fail (ST_IS_THEME_NODE (node), NULL);
-
-  return node->pseudo_class;
-}
-
 /**
  * st_theme_node_get_pseudo_classes:
  *

diff --git a/src/st/st-theme-node.h b/src/st/st-theme-node.h
index 31b200d7f74f2c3bdf16d20546708fe06cf44b73..085fa6aa41b66f6ebf7d1c2208cff564318b8eec 100644 (file)
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@@ -113,9 +113,7 @@ gboolean    st_theme_node_equal (StThemeNode *node_a, StThemeNode *node_b);
 
 GType       st_theme_node_get_element_type  (StThemeNode *node);
 const char *st_theme_node_get_element_id    (StThemeNode *node);
-const char *st_theme_node_get_element_class (StThemeNode *node);
 GStrv       st_theme_node_get_element_classes (StThemeNode *node);
-const char *st_theme_node_get_pseudo_class  (StThemeNode *node);
 GStrv       st_theme_node_get_pseudo_classes (StThemeNode *node);
 
 /* Generic getters ... these are not cached so are less efficient. The other